Some fix for VC.
authorXue Fuqiao <xfq.free@gmail.com>
Mon, 3 Jun 2013 23:37:20 +0000 (07:37 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Mon, 3 Jun 2013 23:37:20 +0000 (07:37 +0800)

Trivial merge